Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 19 Sep 2011 03:06:00 +0000 (20:06 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 19 Sep 2011 03:06:00 +0000 (20:06 -0700)

Trivial merge